Fix error message for duplicate waypoint #30548

dukenv0307 · 2023-10-28T09:18:00Z

Details

Fix error message for duplicate waypoint

Fixed Issues

$ #29803
PROPOSAL: #29803 (comment)

Tests

Go to FAB > Request money > Distance
Choose the same waypoint for start and finish
Click on the next button and verify that the error Please enter at least two waypoints appears
Add a stop waypoint with the same address
Click on next button and verify that the error Please enter at least two waypoints appears

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

Go to FAB > Request money > Distance
Choose the same waypoint for start and finish
Click on the next button and verify that the error Please enter at least two waypoints appears
Add a stop waypoint with the same address
Click on next button and verify that the error Please enter at least two waypoints appears

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2023-10-28.at.16.01.22.mov

Android: mWeb Chrome

Screen.Recording.2023-10-28.at.15.56.33.mov

iOS: Native

Screen.Recording.2023-10-28.at.16.03.16.mov

iOS: mWeb Safari

Screen.Recording.2023-10-28.at.15.54.10.mov

MacOS: Chrome / Safari

Screen.Recording.2023-10-28.at.16.17.13.mov

MacOS: Desktop

Screen.Recording.2023-10-28.at.16.15.39.mov

melvin-bot · 2023-10-28T09:18:28Z

@ntdiary Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

ntdiary · 2023-10-30T18:15:59Z

@dukenv0307, please check this #29803 (comment), I think we want to change the error message content.

dukenv0307 · 2023-10-31T11:21:56Z

@ntdiary I updated the code and the test step.

ntdiary · 2023-10-31T15:17:36Z

src/components/DistanceRequest/index.js

-
-        if (_.size(validatedWaypoints) < 2) {
+        const isDuplicatedWaypoints = numberOfNoneEmptyWaypoints > _.size(validatedWaypoints) && _.size(validatedWaypoints) === 1;
+        if (_.size(validatedWaypoints) < 2 || isDuplicatedWaypoints) {


I meant that we don't need isDuplicatedWaypoints and numberOfNoneEmptyWaypoints. Also, we can delete iou.error.duplicateWaypointsErrorMessage and its translation

ntdiary · 2023-10-31T15:22:03Z

src/components/DistanceRequest/index.js

-
-        if (_.size(validatedWaypoints) < 2) {
+        const isDuplicatedWaypoints = numberOfNoneEmptyWaypoints > _.size(validatedWaypoints) && _.size(validatedWaypoints) === 1;
+        if (_.size(validatedWaypoints) < 2 || isDuplicatedWaypoints) {
            return {0: translate('iou.error.emptyWaypointsErrorMessage')};


we can replace iou.error.emptyWaypointsErrorMessage with iou.error.atLeastTwoDifferentWaypoints, its content: Please enter at least two different waypoints

dukenv0307 · 2023-11-01T05:16:51Z

@ntdiary I updated.

ntdiary

need to confirm translation

src/languages/en.ts

src/languages/es.ts

Co-authored-by: wentao <[email protected]>

dukenv0307 · 2023-11-01T09:50:34Z

Updated.

ntdiary · 2023-11-01T14:57:05Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

30548-mobile-android.mp4

Android: mWeb Chrome

30548-mobile-chrome.mp4

iOS: Native

30548-mobile-ios.mp4

iOS: mWeb Safari

30548-mobile-safari.mp4

MacOS: Chrome / Safari

30548-web.mp4

MacOS: Desktop

30548-desktop.mp4

ntdiary

Hi, @tgolen, We still need to confirm the Spanish translation. : )

en: Please enter at least two different waypoints.
es: Por favor introduce al menos dos puntos de ruta diferentes.

tgolen · 2023-11-01T15:29:30Z

I'll wait to merge until I hear word that the translations are approved.

ntdiary · 2023-11-01T15:55:30Z

I'll wait to merge until I hear word that the translations are approved.

Honestly, I'm not too sure how to request approval for translation. Based on the reviewer checklist, we can add a "Waiting for Copy" label to the original issue, but sometimes I also see people asking in #expensify-open-source or internal channels. 😂

I just noticed the label was added.

dukenv0307 · 2023-11-06T05:25:11Z

@tgolen The translation is confirmed. I think we can merge now.

ntdiary

It seems the latest code doesn't use confirmed translations

ntdiary · 2023-11-06T05:48:32Z

src/languages/en.ts

@@ -592,8 +592,7 @@ export default {
            genericDeleteFailureMessage: 'Unexpected error deleting the money request, please try again later',
            genericEditFailureMessage: 'Unexpected error editing the money request, please try again later',
            genericSmartscanFailureMessage: 'Transaction is missing fields',
-            duplicateWaypointsErrorMessage: 'Please remove duplicate waypoints',
-            emptyWaypointsErrorMessage: 'Please enter at least two waypoints',
+            atLeastTwoDifferentWaypoints: 'Please enter at least two different waypoints',


en: Please enter at least two different addresses.

ntdiary · 2023-11-06T05:49:20Z

src/languages/es.ts

@@ -586,8 +586,7 @@ export default {
            genericDeleteFailureMessage: 'Error inesperado eliminando la solicitud de dinero. Por favor, inténtalo más tarde',
            genericEditFailureMessage: 'Error inesperado al guardar la solicitud de dinero. Por favor, inténtalo más tarde',
            genericSmartscanFailureMessage: 'La transacción tiene campos vacíos',
-            duplicateWaypointsErrorMessage: 'Por favor elimina los puntos de ruta duplicados',
-            emptyWaypointsErrorMessage: 'Por favor introduce al menos dos puntos de ruta',
+            atLeastTwoDifferentWaypoints: 'Por favor introduce al menos dos puntos de ruta diferentes',


es: Por favor introduce al menos dos direcciones diferentes.

dukenv0307 · 2023-11-06T06:26:42Z

@ntdiary I updated.

ntdiary · 2023-11-06T17:23:42Z

Just finished the checklist, if the reviewer check job can be run again, it should pass. : )

tgolen · 2023-11-07T14:12:48Z

All right, it's passing now. @ntdiary did you want to approve the PR? It sounds like you approve, but there isn't an officially approved review, so I wanted to check.

ntdiary · 2023-11-07T14:33:27Z

All right, it's passing now. @ntdiary did you want to approve the PR? It sounds like you approve, but there isn't an officially approved review, so I wanted to check.

@tgolen, ah, yeah, I have approved it already, I think we can merge it now. (not sure why it didn't show up, might be related to the change request above not being manually marked as resolved?)

OSBotify · 2023-11-07T15:48:43Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2023-11-08T08:30:48Z

🚀 Deployed to staging by https://github.com/tgolen in version: 1.3.96-6 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2023-11-09T22:46:19Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.3.96-15 🚀

platform	result
🤖 android 🤖	failure ❌
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2023-11-10T16:02:27Z

🚀 Deployed to staging by https://github.com/tgolen in version: 1.3.98-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2023-11-14T21:55:55Z

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.98-5 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

fix error message for duplicate waypoint

35ff994

dukenv0307 marked this pull request as ready for review October 28, 2023 09:18

dukenv0307 requested a review from a team as a code owner October 28, 2023 09:18

melvin-bot bot removed the request for review from a team October 28, 2023 09:18

melvin-bot bot requested a review from ntdiary October 28, 2023 09:18

dukenv0307 added 2 commits October 31, 2023 18:13

Merge branch 'main' into fix/29803

a140942

update error message

2d765cb

ntdiary reviewed Oct 31, 2023

View reviewed changes

dukenv0307 added 2 commits November 1, 2023 12:04

Merge branch 'main' into fix/29803

df63c92

update condition

cb0364c

ntdiary suggested changes Nov 1, 2023

View reviewed changes

src/languages/en.ts Outdated Show resolved Hide resolved

src/languages/en.ts Outdated Show resolved Hide resolved

src/languages/es.ts Outdated Show resolved Hide resolved

dukenv0307 and others added 4 commits November 1, 2023 16:46

Update src/languages/en.ts

0fecc01

Co-authored-by: wentao <[email protected]>

Update src/languages/en.ts

162b8c0

Co-authored-by: wentao <[email protected]>

Update src/languages/es.ts

6fc3fdd

Co-authored-by: wentao <[email protected]>

remove un-use translation

69459bf

ntdiary approved these changes Nov 1, 2023

View reviewed changes

melvin-bot bot requested a review from tgolen November 1, 2023 15:23

tgolen previously approved these changes Nov 1, 2023

View reviewed changes

merge main

799ff5a

dukenv0307 dismissed tgolen’s stale review via 799ff5a November 6, 2023 05:24

ntdiary suggested changes Nov 6, 2023

View reviewed changes

update translation

4e9bfe9

fix lint

3a60fa0

tgolen approved these changes Nov 6, 2023

View reviewed changes

tgolen merged commit 5654bfc into Expensify:main Nov 7, 2023
14 checks passed

OSBotify mentioned this pull request Nov 8, 2023

Deploy Checklist: New Expensify 2023-11-06 #30929

Closed

OSBotify mentioned this pull request Nov 10, 2023

Deploy Checklist: New Expensify 2023-11-10 #31187

Closed

rojiphil mentioned this pull request Nov 13, 2023

[HOLD for payment 2024-01-17] [$500] Distance - Able to request money by distance by adding a stop same as finish point without enterring start point From #29895

Closed

6 tasks

tgolen mentioned this pull request Dec 4, 2023

[$500] Distance - Inconsistency in error message when more than two same adddress is added #29803

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix error message for duplicate waypoint #30548

Fix error message for duplicate waypoint #30548

dukenv0307 commented Oct 28, 2023 •

edited

Loading

melvin-bot bot commented Oct 28, 2023

ntdiary commented Oct 30, 2023

dukenv0307 commented Oct 31, 2023

ntdiary Oct 31, 2023

ntdiary Oct 31, 2023

dukenv0307 commented Nov 1, 2023

ntdiary left a comment

dukenv0307 commented Nov 1, 2023

ntdiary commented Nov 1, 2023 •

edited

Loading

ntdiary left a comment •

edited

Loading

tgolen commented Nov 1, 2023

ntdiary commented Nov 1, 2023 •

edited

Loading

dukenv0307 commented Nov 6, 2023

ntdiary left a comment

ntdiary Nov 6, 2023

ntdiary Nov 6, 2023

dukenv0307 commented Nov 6, 2023

ntdiary commented Nov 6, 2023

tgolen commented Nov 7, 2023

ntdiary commented Nov 7, 2023

OSBotify commented Nov 7, 2023

OSBotify commented Nov 8, 2023

OSBotify commented Nov 9, 2023

OSBotify commented Nov 10, 2023

OSBotify commented Nov 14, 2023

Fix error message for duplicate waypoint #30548

Fix error message for duplicate waypoint #30548

Conversation

dukenv0307 commented Oct 28, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Oct 28, 2023

ntdiary commented Oct 30, 2023

dukenv0307 commented Oct 31, 2023

ntdiary Oct 31, 2023

Choose a reason for hiding this comment

ntdiary Oct 31, 2023

Choose a reason for hiding this comment

dukenv0307 commented Nov 1, 2023

ntdiary left a comment

Choose a reason for hiding this comment

dukenv0307 commented Nov 1, 2023

ntdiary commented Nov 1, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

ntdiary left a comment • edited Loading

Choose a reason for hiding this comment

tgolen commented Nov 1, 2023

ntdiary commented Nov 1, 2023 • edited Loading

dukenv0307 commented Nov 6, 2023

ntdiary left a comment

Choose a reason for hiding this comment

ntdiary Nov 6, 2023

Choose a reason for hiding this comment

ntdiary Nov 6, 2023

Choose a reason for hiding this comment

dukenv0307 commented Nov 6, 2023

ntdiary commented Nov 6, 2023

tgolen commented Nov 7, 2023

ntdiary commented Nov 7, 2023

OSBotify commented Nov 7, 2023

OSBotify commented Nov 8, 2023

OSBotify commented Nov 9, 2023

OSBotify commented Nov 10, 2023

OSBotify commented Nov 14, 2023

dukenv0307 commented Oct 28, 2023 •

edited

Loading

ntdiary commented Nov 1, 2023 •

edited

Loading

ntdiary left a comment •

edited

Loading

ntdiary commented Nov 1, 2023 •

edited

Loading